When merging projects you can reuse resources and objects you created in another project. Merging projects allows you to import a complete project or only selected resources and objects. During merging Kanzi provides conflict resolution.
Kanzi provides these options for bringing content from other projects:
To merge projects:
After configuring your version control tool you can use the Kanzi merge tool for Kanzi project updating and merging. For the integration Kanzi requires a version control tool that provides the necessary parameters to the Kanzi merge tool.
Example of parameter types | Description |
---|---|
MINE | The parameter for the source project. |
THEIRS | The parameter for the target project. |
BASE | The parameter for the base project. |
MERGED | The parameter for the merged project. |
To integrate the Kanzi merge tool with a version control tool:
To integrate the Kanzi merge tool with SVN version control software, open the SVN settings and add Kanzi merge tool as an external program for merging files with the .kzproj extension.
For example, if you are using Tortoise SVN, open these settings by going to SVN > Settings > External Programs > Merge Tool > Advanced and set:
<KanziInstallation>/Studio/Bin/KanziMergeTool.bat "<KanziInstallation>/Studio/Bin/ KanziStudio.exe" %mine %theirs %base %merged
C:\Program Files (x86)\Rightware\Kanzi\Studio\Bin\KanziMergeTool.bat "C:\Program Files (x86)\Rightware\Kanzi\Studio\Bin\KanziStudio.exe" %mine %theirs %base %merged